TortoiseSVN is a really easy to use Revision control/version control/source control software for Windows. It is based on Apache™ Subversion (SVN)®; TortoiseSVN provides a nice and easy user interface for Subversion.
DetailsAdvanced 2 and 3-way file comparison (diff), merging, and folder synchronization
Details